Update llpc to handle new version of llvm #2799
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This comment was marked as outdated.
This comment was marked as outdated.
mbrkusanin
force-pushed
the
llpc-getzext-fix
branch
from
9c66e70 to
97cd4fd
Compare
This comment was marked as outdated.
This comment was marked as outdated.
mbrkusanin
force-pushed
the
llpc-getzext-fix
branch
from
efc8586 to
8fd9b2d
Compare
dstutt
reviewed
Nov 6, 2023
| if (spvType->isTypeBool() || (spvType->isTypeVector() && spvType->getVectorComponentType()->isTypeBool())) { | ||
| if (constStoreValue->getType() != storeType) { | ||
| constStoreValue = ConstantFoldCastOperand(Instruction::ZExt, constStoreValue, storeType, m_m->getDataLayout()); | ||
| if (!constStoreValue) |
There was a problem hiding this comment.
I wonder if an assert might be more appropriate here? I think the constant fold should always succeed shouldn't it unless a non-const value is passed in (in which case asserting might be the most helpful thing to do since that would be unexpected).
There was a problem hiding this comment.
Changed to an assert.
| initializer = ConstantExpr::getZExt(initializer, type); | ||
| initializer = ConstantFoldCastOperand(Instruction::ZExt, initializer, type, m_m->getDataLayout()); | ||
| if (!initializer) | ||
| return nullptr; |
There was a problem hiding this comment.
Same as above - and even if returning nullptr is appropriate - it'll do that anyway since the next statement outside the if is a return of initializer.
There was a problem hiding this comment.
Changed to an assert.
Test summary for commit 8fd9b2dCTS tests (Failed: 0/137941)
Ubuntu navi3x, SrdcvkUbuntu navi2x, Srdcvk |
Handle upstream llvm changes for llvm/llvm-project@e4a4122 [IR] Remove zext and sext constant expressions (#71040)
mbrkusanin
force-pushed
the
llpc-getzext-fix
branch
from
8fd9b2d to
ca1bc71
Compare
Test summary for commit ca1bc71CTS tests (Failed: 0/137941)
Ubuntu navi3x, SrdcvkUbuntu navi2x, Srdcvk |
nhaehnle
approved these changes
Nov 6, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Handle upstream llvm changes for llvm/llvm-project@e4a4122 [IR] Remove zext and sext constant expressions (#71040)